Skip to content

Fix followup formatting: preserve HTML in responses, strip from clipboard - #84452

Merged
dangrous merged 2 commits into
mainfrom
marco/fix-followup-formatting-bugs
Mar 11, 2026
Merged

dangrous merged 2 commits into
mainfrom
marco/fix-followup-formatting-bugs

Conversation

@marcochavezf

@marcochavezf marcochavezf commented Mar 6, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixes two of three formatting bugs with Concierge suggested followup buttons (companion to the Auth PR):

Bug 2 -- Followup data leaks into "Copy message": The catch-all clipboard handler in ContextMenuActions.tsx was passing raw HTML (including custom <followup-list> elements) through Parser.htmlToText, which does not know about these custom elements and renders their text content into the clipboard. Added a stripFollowupListFromHtml call before the clipboard copy so followup questions and pre-generated responses are removed.

Bug 3 -- Bullet lists collapsed in pre-generated responses: parseFollowupsFromHtml was using DomUtils.textContent to extract <followup-response> content, which strips all HTML tags. Bullet lists, bold text, etc. were flattened into a single unformatted string. Changed to render (from dom-serializer) which preserves the HTML structure, allowing the response to render correctly when displayed as a Concierge message.

Data Flow

Clipboard copy pipeline (Bug 2):

User long-presses message → ContextMenuActions "Copy" handler
  → reads `content` (raw HTML from ReportAction)
  → [NEW] stripFollowupListFromHtml(content)  ← removes <followup-list> elements
  → mention-user replacement
  → setClipboardMessage → Parser.htmlToText → clipboard

Without the strip step, Parser.htmlToText does not recognize the custom <followup-list> / <followup-text> / <followup-response> elements, so their text content (followup questions and pre-generated answers) leaks into the pasted text.

Followup response rendering pipeline (Bug 3):

Concierge HTML response containing <followup-list>
  → parseFollowupsFromHtml (ReportActionFollowupUtils/index.ts)
    → htmlparser2.parseDocument extracts each <followup-response> element
    → [OLD] DomUtils.textContent(el)  ← strips ALL tags, loses <ul>/<li>/<strong> etc.
    → [NEW] render(el.children)       ← serializes child nodes back to HTML string
  → response stored as Followup.response
  → sent as Concierge message → rendered with full HTML formatting

DomUtils.textContent is correct for <followup-text> (plain button label), but <followup-response> contains rich HTML that must survive the extraction.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/608799
PROPOSAL:

Tests

  1. Ask Concierge a question that triggers followup suggestions with bullet-list answers (e.g. "How do I set up QuickBooks?")
  2. Click a followup button that has a pre-generated response containing a bullet list
  3. Verify the Concierge reply renders the bullet list with proper formatting (not collapsed into one line)
  4. Long-press/right-click a Concierge message that has followup buttons visible
  5. Select "Copy message" and paste into a text editor
  6. Verify followup question text and pre-generated responses do NOT appear in the pasted content
  • Verify that no errors appear in the JS console

Offline tests

N/A -- followup buttons require an active Concierge connection. The clipboard stripping and HTML parsing are purely client-side transformations that work identically offline.

QA Steps

  1. Open a Concierge chat and ask a question that triggers suggested followups
  2. Click a followup button and verify the response renders with proper bullet formatting
  3. Copy a Concierge message with followup buttons and verify no followup text leaks into clipboard
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

…wups from clipboard

Bug 2 (frontend): Strip <followup-list> from HTML before copying to clipboard so followup questions and pre-generated responses do not leak into Copy message.

Bug 3: Use getInnerHTML instead of textContent when parsing followup-response elements so bullet lists and other HTML formatting are preserved.

Issue: Expensify/Expensify#608799

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@marcochavezf
marcochavezf requested review from a team as code owners March 6, 2026 20:20
@melvin-bot
melvin-bot Bot requested a review from mananjadhav March 6, 2026 20:20
@melvin-bot

melvin-bot Bot commented Mar 6, 2026

Copy link
Copy Markdown

@mananjadhav Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team March 6, 2026 20:20
@codecov

codecov Bot commented Mar 6, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/libs/ReportActionFollowupUtils/index.ts 96.15% <100.00%> (ø)
...es/inbox/report/ContextMenu/ContextMenuActions.tsx 25.61% <50.00%> (+0.12%) ⬆️
... and 25 files with indirect coverage changes

@joekaufmanexpensify joekaufmanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good for product

getInnerHTML from domutils is deprecated; use the dom-serializer module
directly as recommended. The > character is no longer entity-encoded
in text content, which is valid HTML — update the test expectation
to match.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@quinthar

Copy link
Copy Markdown
Contributor

@mananjadhav What is your ETA?

const followupTextElement = DomUtils.getElementsByTagName('followup-text', followupEl, true).at(0);
const followupResponseElement = DomUtils.getElementsByTagName('followup-response', followupEl, true).at(0);
const text = followupTextElement ? DomUtils.textContent(followupTextElement) : '';
const response = followupResponseElement ? DomUtils.textContent(followupResponseElement) : undefined;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: @marcochavezf the only thing I want to highlight is this will ensure that it'll return HTML for all the strings. I know it's already mentioned in the PR body

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, it's intentional, so now formatted responses from follow-ups (bold, lists, links from the help center) are preserved when displayed

@mananjadhav

mananjadhav commented Mar 11, 2026 •

Copy link
Copy Markdown
Collaborator

Screenshots/Videos

Android: HybridApp
android-html-copy-response.mov
Android: mWeb Chrome
mweb-chrome-html-copy-response.mov
iOS: HybridApp
iOS: mWeb Safari
mweb-safari-html-copy-response.mov
MacOS: Chrome / Safari
web-copy-html-response.mov

@mananjadhav

Copy link
Copy Markdown
Collaborator

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

@mananjadhav mananjadhav left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have trouble with iOS but the change isn't native. Works fine on all the other platforms. One question I highlighted to confirm expectations.

@melvin-bot
melvin-bot Bot requested a review from dangrous March 11, 2026 01:13
@melvin-bot

melvin-bot Bot commented Mar 11, 2026

Copy link
Copy Markdown

@dangrous Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot

melvin-bot Bot commented Mar 11, 2026

Copy link
Copy Markdown

🎯 @mananjadhav, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #84830.

@dangrous dangrous left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@dangrous
dangrous merged commit 6b9a7cc into main Mar 11, 2026
36 of 39 checks passed
@dangrous
dangrous deleted the marco/fix-followup-formatting-bugs branch March 11, 2026 18:48
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

Copy link
Copy Markdown
Contributor

🚧 @dangrous has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/dangrous in version: 9.3.36-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@m-natarajan

Copy link
Copy Markdown

Passed, Chrome / 9.3.36-6

Screen.Recording.2026-03-12.at.15.44.25.mp4

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.36-10 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@mallenexpensify

Copy link
Copy Markdown
Contributor

@mananjadhav

Copy link
Copy Markdown
Collaborator

Yes @mallenexpensify. I just went through the PR history and found the issue. Sorry for the unnecessary tag.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants